Autogenerated HTML docs for v1.6.0.1-285-g1070
diff --git a/gitattributes.txt b/gitattributes.txt index 5fb5007..75124d2 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -311,18 +311,20 @@ - `bibtex` suitable for files with BibTeX coded references. +- `html` suitable for HTML/XHTML documents. + - `java` suitable for source code in the Java lanugage. - `pascal` suitable for source code in the Pascal/Delphi language. +- `php` suitable for source code in the PHP language. + - `python` suitable for source code in the Python language. - `ruby` suitable for source code in the Ruby language. - `tex` suitable for source code for LaTeX documents. -- `html` suitable for HTML/XHTML documents. - Performing a three-way merge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
